auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 03:46:14 +0000 (04:46 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 21 Dec 2012 03:46:14 +0000 (04:46 +0100)

Trivial merge